From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 19 Oct 2023 03:53:03 +0000 (+0000)
Subject: Manual merge of version 2.38.5-1~deb11u1+rpi1 and 2.42.1-1~deb11u1 to produce 2.42... 
X-Git-Tag: archive/raspbian/2.42.1-1_deb11u1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=60ab88c9cf31e63e6a318bab69b3f312103a3c19;p=webkit2gtk.git

Manual merge of version 2.38.5-1~deb11u1+rpi1 and 2.42.1-1~deb11u1 to produce 2.42.1-1~deb11u1+rpi1
---

60ab88c9cf31e63e6a318bab69b3f312103a3c19
diff --cc debian/changelog
index 5dadd85444,2e51e9be7b..1af1186ba1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,4 +1,12 @@@
- webkit2gtk (2.38.5-1~deb11u1+rpi1) bullseye-staging; urgency=medium
++webkit2gtk (2.42.1-1~deb11u1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Feb 2023 09:28:41 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Oct 2023 03:51:56 +0000
 +
- webkit2gtk (2.38.5-1~deb11u1) bullseye-security; urgency=medium
+ webkit2gtk (2.42.1-1~deb11u1) bullseye-security; urgency=medium
  
    * Rebuild for bullseye-security.
    * gcc 10 segfaults when building webkit in amd64 (see #1008098) so use
diff --cc debian/rules
index c5782ca46d,234ea1519d..8a0e67a134
--- a/debian/rules
+++ b/debian/rules
@@@ -65,18 -82,8 +82,13 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),arm64
  	EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF
  endif
  
 +# https://bugs.webkit.org/show_bug.cgi?id=188862
 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
 +	EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF
 +endif
 +
- # Disable Gold where it causes build problems, see #949618
- ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))
- 	EXTRA_CMAKE_ARGUMENTS += -DUSE_LD_GOLD=OFF
- endif
- 
  # Lower memory requirements on architectures with only 2 GB address space
- ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel sh4))
+ ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel))
  	CFLAGS := $(CFLAGS:-g1=-g0)
  	CFLAGS := $(CFLAGS:-O2=-Os)
  	CPPFLAGS += --param ggc-min-expand=10